Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #49834 upstream release 1.7 #50862

Merged
merged 1 commit into from
Aug 24, 2017
Merged

Automated cherry pick of #49834 upstream release 1.7 #50862

merged 1 commit into from
Aug 24, 2017
+76 −4

Conversation

guoshimin
Copy link
Contributor

@guoshimin guoshimin commented Aug 17, 2017 •
edited by wojtek-t

Cherry pick of #49834 on release-1.7.

#49834: Fix premature return

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 17, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @guoshimin. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Aug 17, 2017
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 17, 2017
@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Aug 17, 2017
@mengqiy
Copy link
Member

mengqiy commented Aug 17, 2017

/ok-to-test
/lgtm
Release-note format doesn't looks right.

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 17, 2017
@k8s-github-robot k8s-github-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Aug 17, 2017
@guoshimin
Copy link
Contributor Author

/retest

@guoshimin
Copy link
Contributor Author

/assign @pwittrock

@guoshimin
Copy link
Contributor Author

guoshimin commented Aug 22, 2017 via email

@pwittrock
Copy link
Member

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guoshimin, mengqiy, pwittrock

Associated issue: 49834

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 22, 2017
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@mengqiy
Copy link
Member

mengqiy commented Aug 23, 2017

cc 1.7 branch manager @wojtek-t

@wojtek-t
Copy link
Member

@guoshimin - if you want this to be cherrypicked please add a user-oriented release note to the original PR

@guoshimin
Copy link
Contributor Author

@wojtek-t Added a release note in the original PR #49834

@wojtek-t wojtek-t changed the title Fix premature return Automated cherry pick of #49834 upstream release 1.7 Aug 24, 2017
@wojtek-t wojtek-t added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Aug 24, 2017
@wojtek-t wojtek-t added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Aug 24, 2017
@wojtek-t wojtek-t added this to the v1.7 milestone Aug 24, 2017
@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit d62cff6 into kubernetes:release-1.7 Aug 24, 2017
@lewismarshall lewismarshall mentioned this pull request Sep 8, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@apelisse apelisse

@mengqiy mengqiy

@pwittrock pwittrock

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@guoshimin @k8s-ci-robot @mengqiy @pwittrock @k8s-github-robot @k8s-cherrypick-bot @wojtek-t @apelisse